group/views.py

@@ -224,22 +224,19 @@ def group_join_api(request):

                     if group.group_lock:
              

                         return response(GroupStatusCode.GROUP_HAS_LOCKED)
              

                 
              

                -    # 重复申请校验
              

                -    if (r.sismember(GROUP_USERS_APPLYING_SET % group_id, user_id) or
              

                -            r.sismember(GROUP_USERS_PASSED_SET % group_id, user_id)):
              

                -        return response(GroupStatusCode.DUPLICATE_JOIN_REQUEST)
              

                -
              

                -    # 群组用户记录创建
              

                -    GroupUserInfo.objects.create(
              

                +    # 群组用户记录创建，若记录不存在，则创建，若记录已存在，则更新
              

                +    group_user, created = GroupUserInfo.objects.get_or_create(
              

                         group_id=group_id,
              

                         user_id=user_id,
              

                -        current_id=int(r.get(GROUP_LAST_PHOTO_PK % group_id) or -1),
              

                -        nickname=nickname or user.final_nickname,
              

                -        avatar=user.avatar,
              

                -        admin=False,
              

                -        user_status=GroupUserInfo.PASSED,
              

                -        passed_at=tc.utc_datetime(),
              

                     )
              

                +    if not created:
              

                +        group_user.current_id = int(r.get(GROUP_LAST_PHOTO_PK % group_id) or -1)
              

                +        group_user.nickname = nickname or user.final_nickname
              

                +        group_user.avatar = user.avatar
              

                +        group_user.admin = False
              

                +        group_user.user_status = GroupUserInfo.PASSED
              

                +        group_user.passed_at = tc.utc_datetime()
              

                +        group_user.save()
              

                 
              

                     # Redis 群组用户数据缓存
              

                     set_group_users_info(group)